Skip to content

fix(code-schematics): preserve project-specific gitignore entries#618

Merged
TorinAsakura merged 8 commits intomasterfrom
fix/schematics-preserve-gitignore
Apr 29, 2026
Merged

fix(code-schematics): preserve project-specific gitignore entries#618
TorinAsakura merged 8 commits intomasterfrom
fix/schematics-preserve-gitignore

Conversation

@TorinAsakura
Copy link
Copy Markdown
Member

Таска

Как проверять

До фикса

  1. Контекст: повторный запуск schematics (project.factory) в проекте с пользовательскими строками в .gitignore.
    Действие: schematics применяет MergeStrategy.Overwrite для common templates.
    Ожидаемый результат: пользовательские строки из .gitignore теряются, файл заменяется шаблонным.

После фикса

  1. Контекст: code/code-schematics/src/schematic/project/project.factory.ts.
    Действие: перед merge сохраняется исходный .gitignore, после применения шаблонов выполняется детерминированный merge шаблонных и project-specific строк.
    Ожидаемый результат: шаблонные правила остаются актуальными, пользовательские строки сохраняются и не дублируются.
  2. Контекст: code/code-schematics/src/schematic/utils/merge-gitignore-content.utils.test.ts.
    Действие: проверяются сценарии merge, идемпотентности и отсутствия дублей.
    Ожидаемый результат: тесты покрывают критерии задачи по сохранению и стабильности .gitignore.

Пруфы

  • yarn check (локально): passed (exit code 0)
  • Добавлен merge helper: mergeGitIgnoreContent(...)
  • Добавлен unit test: merge-gitignore-content.utils.test.ts

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 921dd55852

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread code/code-schematics/src/schematic/utils/merge-gitignore-content.utils.ts Outdated
Comment thread code/code-schematics/src/schematic/utils/merge-gitignore-content.utils.ts Outdated
@TorinAsakura
Copy link
Copy Markdown
Member Author

@codex review

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 17944f0e7d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread code/code-schematics/src/schematic/utils/merge-gitignore-content.utils.ts Outdated
@TorinAsakura
Copy link
Copy Markdown
Member Author

@codex review

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f1bb3ca655

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread code/code-schematics/src/schematic/utils/merge-gitignore-content.utils.ts Outdated
@TorinAsakura
Copy link
Copy Markdown
Member Author

@codex review

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 96546d7f5d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread code/code-schematics/src/schematic/utils/merge-gitignore-content.utils.ts Outdated
@TorinAsakura
Copy link
Copy Markdown
Member Author

@codex review

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: fdbf668865

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread code/code-schematics/src/schematic/utils/merge-gitignore-content.utils.ts Outdated
@TorinAsakura
Copy link
Copy Markdown
Member Author

@codex review

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 518546d0a0

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread code/code-schematics/src/schematic/utils/merge-gitignore-content.utils.ts Outdated
@TorinAsakura
Copy link
Copy Markdown
Member Author

@codex review

Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 63d4372b05

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread code/code-schematics/src/schematic/utils/merge-gitignore-content.utils.ts Outdated
@TorinAsakura
Copy link
Copy Markdown
Member Author

@codex review

@chatgpt-codex-connector
Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Keep them coming!

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@TorinAsakura TorinAsakura merged commit 79a4c84 into master Apr 29, 2026
7 checks passed
@TorinAsakura TorinAsakura deleted the fix/schematics-preserve-gitignore branch April 29, 2026 02:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug] Schematics не должен перезаписывать пользовательский gitignore

1 participant